keyboardManager: Use layout id when reapplying

`_doApply()` expects the id rather than the layout info itself. Passing
the layout info caused the lookup to fail and the function to exit
early. This was preventing `xkb-option` or `xkb-model` settings from
applying when changed.

Fixes: 0f9034687 ("status/keyboard: Adapt to external source of keyboard layout")
Closes: https://gitlab.gnome.org/GNOME/gnome-shell/-/work_items/9197
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/4205>

diff --git a/js/misc/keyboardManager.js b/js/misc/keyboardManager.js
index 5724156e19007230a5aa6a8edde4602eeec29f2c..a0cea79b1b2340e32ae5fa8a26ab7ed308975e25 100644 (file)
--- a/js/misc/keyboardManager.js
+++ b/js/misc/keyboardManager.js
@@ -130,7 +130,7 @@ class KeyboardManager extends Signals.EventEmitter {
         if (!this._current)
             return;
 
-        this._doApply(this._current).catch(logError);
+        this._doApply(this._current.id).catch(logError);
     }
 
     setUserLayouts(ids) {